Merge "Fix some states in catalog to survive config changes" into androidx-main
1 file changed