Merge "Set views below shelf explicitly invisible to skip hardware rendering" into sc-dev