Merge "Run onUserConfigChanged broadcast on a different thread" into main