Merge "Fix potential crash in SearchFragment#dismiss()." into rvc-dev