Merge "DO NOT MERGE Adding tests for updated EmptyShadeView logic" into tm-qpr-dev