Merge "Hide all system actions if there are custom actions." into udc-dev