Merge "Hide EmptyShadeView during OCCLUDED->AOD transition" into udc-qpr-dev