Merge "Camera: Fix a bad assumption on keySet ordering in BokehActivity" into android12L-tests-dev