Merge "ChangeScreen2: Fix NPE in /related caused by wrong variable"