Merge "Stop invoking secdiscard when deleting password data" into pi-dev