am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '6cb8ae4c16cb3b0105ebfbb23be23e0fb1131496':
  Disabling cling when the user moves the folder before launching it. (Bug 12963868)