Merge "Screen record UI polish" into sc-dev