Merge "Refactor Layer/ColorLayer into siblings"