Merge "Fix handling for onItemClick of fixed collection items" into sc-dev