Merge "Use layers for reveal drawable"