Fixed bug when applying video settings using keyboard / controller Merge branch 'master' of SpaceUsurperUnity