am 25d70e7d: am 1caa0f28: Merge "Navigate up if up is pressed for nested folders" into ub-gmail-ur14-dev

* commit '25d70e7dd5bc1a91fb24b7001a1c7ba1475a324d':
  Navigate up if up is pressed for nested folders