Merge "Patch the dark theme missed bar and icons" into qt-dev am: 51acdc1a97
am: 955ab994fc

Change-Id: I21d1c14aafaa77c207663e83546cace1e6587b2f