[Feature reviewed] MKosharnyy [Reviewed] VKamyshniy Manually clean up merge mess, indentation, logic weakness, initializer order, etc. Conflicts: libs/gtkmm2ext/gtkmm2ext/persistent_tooltip.h libs/gtkmm2ext/persistent_tooltip.cc