Merge "SF: Fix a couple of Layer ref count issues" into nyc-mr1-dev