Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev