Merge "Fix broken SimpleSaveActivityTest#testTapUrlSpanOnCustomDescription_thenTapBack"