Merge "Make ThemePicker override any other AOSP picker" into main