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

Change-Id: I4e7b901bb79773afce7781d5f74bd93a333398e5