Merge "Manage accessibility focus during PhoneWindow save and restore"