Rework camera shutter disable
Merge branch 'jellybean' into JBMP