Switch UI Fix commited by OnPlay