Merge "SF: Refactor onPreComposition"