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

Change-Id: Id23c4e5c3e0d688819d80fc8a6808df9a115e392