am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back...
am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1
* commit 'b54980d1':
Fix issue #5588689: Black camera preview after coming back from gmail