Merge "Merge "Fix issue when launching Camera" into oc-mr1-dev am: 5737af21cb am: b0c8653427"