Merge "Add ThemeOverlay.AppCompat.Dialog themes" into nyc-dev