Merge "Extracting buttons below expanded QS to a separate view and controller" into sc-v2-dev