Merge "Remove hardware layers. Replace alpha by colors-with-alpha"