Merge "Updates flicker documentation and improve naming" into sc-dev