Merge "Fix RTL issue in delete dialog." into nyc-dev