Merge "Disable fullscreen override while camera is active." into 24D1-dev