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: 8023599c am: 20f76a8e
Change-Id: I9762058e95c97b20ba6cb4955998b81e7fc011cb