Merge "Ensure AppCompat can load it's theme before Activity.onCreate()" into lmp-mr1-ub-dev