Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev