Merge pull request #4922 from Memphiz/osxfakefullscreenbp