Merge "Skip a step when blurring" into tm-dev