Merge "DarkUIPreferenceController null exception" into qt-qpr1-dev
am: 48f4e5722e

Change-Id: I7877502602c34080d2ac2e93fb14c66b93b7cff9