Merge "Fix hotseat layout on device rotation." into main