Merge "Migrate rotation lock tile" into main