Merge "CameraBrowser improvements:"