Merge "Make DeviceIdle motion sensing flaggable-off"