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

Change-Id: I3b9d5069fb0f97562dd848b40ea92a5c4dcd07fd