Merge "No focus highlight in prediction row" into sc-dev