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

Change-Id: Ifc878898eb77cfe43ad9ab58f167d987ccf0831d