Merge "Fix issue when launching Camera" into oc-mr1-dev