Merge "Merge "Fixes the crash when launching the app Avoids the crash by...
Merge "Merge "Fixes the crash when launching the app Avoids the crash by updating the app theme to use a Theme.AppCompat." into nyc-dev am: 1af5b85c am: 828e618a" into nyc-mr1-dev-plus-aosp