Merge "Remove duplicate codes for screen position" into devel/master