Merge "Consider subId when loading Call Settings and Dialer status hint strings"