Merge "Fix shade over occluded activity" into tm-qpr-dev