Merge "Make more Wear settings readable by 3P apps." into main