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

Change-Id: I39fe2796e930cb2dc6b7af49c7d34c80349bef7c