Merge "[Settings] Enable access from non-UI thread"