Merge "Unify composited layer/base layer draw path"