Merge "Text - Move cursor's position related code to a different file." into devel...