Merge "Re-land "Add hover state border to overview task item"" into udc-qpr-dev