Merge "Adding tests for updated EmptyShadeView logic" into udc-dev