Merge "Fix the button display problem in Dark theme page" into rvc-dev am:...
Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8f am: 5962711f am: 26953558 am: eb6d6eda
Change-Id: I6415793ddc76c9508c18046d80a2e05963740a10