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

Change-Id: I321966e1478ce4844b954cecd2500304011bedef