Merge "Settings Focus prevented from moving to pref"