Merge "Ensure face icon controller is deactivated when view is detached" into sc-v2-dev