Merge "Don't cancel vibrations in LockIconViewController" into tm-dev