Merge "FakeGlobalSettings: crash in getContentResolver()" into main