Add camera button support, fixed 3rd party file managers.
Merge remote-tracking branch 'origin/master' into Luke