Better focus logic

Change-Id: Idf950c7577f079ff35e9b5526cddef7e899d8d0c
6 files changed