Merge "Make cert selection prompt respect dark mode" into rvc-dev am: 2f71f72266 am: 8c1920284b

Change-Id: Iffb2bc56ea354af4097c9746581698edcd4941fd