Merge "Ensure cursor positioned at end of selection when focus restored" into devel...