Merge "Remove some unused ongoing usage dialog artifacts."