Merge "Merge "Add dark theme for Shell app." into qt-dev am: 190e99cf3a am: 87c7abf06b" into qt-r1-dev-plus-aosp
am: 2f571eddff

Change-Id: Ia28befbd2a7c39c33809aff78899442ff41b51f1