Merge branch 'camera' into ActionBar