am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev

* commit '1bc7fb2dcc954caac78d3fc02eb98ec30658d4d0':
  Fix isThemeAppCompat NPE when using an invalid theme