Merge "Enable View theming before the subdecor is installed" into mnc-ub-dev