Merge "Optimize use of layers in ripple, update dialog styling" into lmp-preview-dev