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

Change-Id: I55d9d610611b2baa111cbcf87bca1c3785b888ee