Merge "mLocalDeviceIdleController could be null." into sc-dev