Merge "Revert "First attempt at AppCompat DayNight themes"" into mnc-dev