Merge "Prevent RevealDrawable from drawing mask when layer is empty"