Merge "AppCompatDelegate - fix cast exception" into nyc-mr1-dev