Videocamera: Fix the settings panel freeze

Same as http://review.cyanogenmod.org/#/c/30553/ for the video settings panel

Change-Id: Ic9b39d8328696b7a14c693e05d4a9d7b48a92b10
Merge "Videocamera: Fix the settings panel freeze" into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1