Merge "AppCompat ThemeOverlay fixes" into lmp-mr1-ub-dev