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: 3248e62e am: 86513a62 am: ef73a232
Change-Id: I20070f776f50c91c17bc9db81b75e0e4cc8c7a5e