Merge "Fix crash on calling removeSelection with showing selection handlers"