am 57884c7e: Merge "Disable the folder cling in two cases" into ub-now-nova

* commit '57884c7ee2835df52913a87ad90e83293c3157d3':
  Disable the folder cling in two cases