Merge "Add @SystemApi to OverlayManager that ThemePicker needs"