Merge "Camera2: protect the device access" into nyc-dev