SF: Fix a couple of Layer ref count issues
am: 92cd24e5f6

Change-Id: Ia62ec102448136979df26ba907bfb1852d4d0373