am b1a2fef7: Merge "Fix regression of unable to focus out of empty gridview" into mnc-dev

* commit 'b1a2fef73075a869a69b77df06042565591e0a7f':
  Fix regression of unable to focus out of empty gridview