am bd6fde13: Merge "Fix the broken build from recent focus navigation handling code (compilation error)." into ub-launcher3-burnaby

* commit 'bd6fde13dfa46b723d7a0560d40aa0d977e8cf6a':
  Fix the broken build from recent focus navigation handling code (compilation error).