Merge "Do not animate icon alignment in phone mode" into main