Merge "SF: Avoid promoting parent layer in binder thread" into sc-dev