Merge "Merge "Allow overlays to be notified about theme changes" into sc-qpr1-dev am: 45319d558c am: a520497728" into sc-v2-dev-plus-aosp