SF: Fix a couple of Layer ref count issues am: de84eb6b82
am: 1ce7c1d3aa

Change-Id: I2ff87a50409fcc244b2cb59286990f98affdedbc