Merge "Don't update dark boot setting onStart" into qt-dev am: 2e967bf7e2
am: 2afa89c638

Change-Id: I815cd7f7fcdb284ada476118840a76c3d5fbc583