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

Change-Id: I15b129f937f55f251ff98f0cecc90a258b01c7a1