Merge "b/5358974 Make pressing up button return to previous time"