Merge branch 'master' into add-camera-capture-to-backstack-#173
Merge branch 'add-camera-capture-to-backstack-#173'