Merge "Stash edit when user idles"