Merge "Collapse shade on ACTION_CANCEL (sometimes)" into rvc-dev