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

Change-Id: I25d8caaeba288ec6c436063cd2c18a26ac657d96