Merge "Dont change android:background in ContextThemeWrapper" into mnc-ub-dev