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

Change-Id: I5c0fe8d4d7bb03c919ab8f30ece94505bf81687a