Merge "Camera application exits if take picture after suspend/resume" am: 450c236e72 am: 1cb4f7ea39
am: ba341487dd

Change-Id: Ifc221e930b1b527af9fff26dc0a2ce948c239edc