Merge "When canceling folder selection, go back to showing correct folder." into honeycomb