Merge "Fix a bug where cards overlap when rotating the screen"