Merge changes from topic "presubmit-am-3403e266474c4051bfe60116a5736278"
* changes:
[automerge] Camera: Switch to query function for display sync 2p: 00abbeb7 2p: 7880b134
[automerge] Camera: Switch to query function for display sync 2p: 00abbeb7
Camera: Switch to query function for display sync