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

Change-Id: Idef5b3e1095e36342923e66f765211d07f94c50b