Merge "Collapse shade when opening controls activities" into rvc-dev