Merge "Force dimBackground on AppCompat's dialog themes" into lmp-mr1-ub-dev