Merge "Reduce duplicated layer assignment and placement"