am 3918640c: Merge "Small fix in Folder text editing"

* commit '3918640c2b0845b7647d5ecf4c0e4f80ade58a79':
  Small fix in Folder text editing