MP1-4578 : Another tweak to focus after resume.