Merge "Adjust point size for 1920x1080" into devel/master