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