Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev