Merge commit 'cd104f4f6837840a8a62ec2296be02478ced75f9' into release
Fix for returnToNormal stays set when you cancel adding a step
Fix for view transition conflict for inverted camera
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/release'