Merge "Make AppCompat's night mode work nicely on M+" into mnc-ub-dev