Also address some Compose lint warnings. (cherry picked from commit 29368fc95312c3a68c039b2f896742002caeb953)