Merge "Remove some hard-coded fullscreen-specific hierarchy logic"