Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb
am: 5962711f8f
am: 8023599c8d
am: 20f76a8e72
Change-Id: I9762058e95c97b20ba6cb4955998b81e7fc011cb
This commit is contained in: