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

Change-Id: I8da2be987f367aa5cc97fae9508cac56b3edd6a6