Merge "Revert to save-layer based alpha if layer would be too large" into mnc-dev