Merge "Move setLayerStack back to max-sdk-o greylist."