Integrates Android fixes that improve focus handling;