Merge "Use alpha instead of invisible for views below shelf to skip redraw" into sc-dev