Merge "Convert file delete to use OOUI"