Merge "Focus doesn\'t leave folders without also closing them." into ub-launcher3-burnaby-polish
am: 298f1c4578

* commit '298f1c4578e45168e74aa4b8561fcd88bfe509fe':
  Focus doesn't leave folders without also closing them.