Merge "Collapse shade for buttons that launch activities" into sc-dev