Merge "fix(fullscreen border): Watch rotation and hide the border before rotation" into main