Merge "Fix issues with z-ordering during animations" into pi-dev