Merge "Dark boot on dark theme." into qt-dev
am: 20b3a8837f

Change-Id: I0c5285eba6153e064d9eea9059f3bfc207e9d3a3