Merge "Fix wrong call forwarding preferences are displayed in multi-window mode" am: e49d86b0cb
am: 5656ddc11a

Change-Id: I1df6605d6a3df2857ef5a9dc90805965e5687e53