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

Change-Id: I94fe4e18d4984bd2e305c6b29c99247aa7455b3c