Merged "ShowWindow(Buttons/Commands)OnTop"

Merged ShowWindowButtonsOnTop with ShowWindowCommandsOnTop, keeping ShowWindowCommandsOnTop.