Merge "Set shortcuts back to original position after shaking" into main