Merge "Revert "Change LayoutPreference resource path in robo test""