Merge "Hide divider immediately if going to launcher" into udc-dev