Merge "Clear displayStartTime whenever starting activity." into klp-dev