Merge "Tweaking enter/scrim animations/styles.  Fixing issue with clipping not saving layers."