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

Change-Id: Iac13fc45e6b5e5dd469ffd42394aa64a65f3d457