Merge \"Simplified search focus logic\" into ub-launcher3-calgary
am: 31be842887

Change-Id: I9ef08f085ba37c91b57075e2c9fcab71f7b40761