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

Change-Id: Iad1d59d9e2f256a394a459185f1226110e6f2e93