Merge "Fix hole in recycler view" into sc-dev