Merge "Remove pending actions when standby"