Merge "Camera: Add more systrace points" into oc-mr1-dev