Merge \"Preventing unnecessary layouts on search focus change\" into ub-launcher3-calgary
am: c9dec56c27

Change-Id: I156effcfa55b47a725793b8d09449962db409e2e