Update focus behaviour to match Samsungs

Thanks to angelsl

Change-Id: I9d2a12a818fce1ca88e635c03fb4fdeaab45bad4