Merge "Allow text-selection scroll indicator to have a different style" into devel...