Merge "Fix the shadow problem caused by layer parent switching"