Merge "Merge "Fix NPE when invoking Context#isUiContext" into rvc-dev am: 5c25605d am: a91c84fa am: f03568fe" into rvc-qpr-dev-plus-aosp