Merge "GridLayoutManager: fire selected event when selected item type changed" into mnc-ub-dev