Merge "Remove concept of layer alpha override" into mnc-dev