Merge "Add Maximize/Minimized in Window" into devel/master