Merge "Override getSaveLayerStrategy instead of willSaveLayer"