Merge "Hide focus until list has been loaded" into sc-dev