am: 3e439db8 -s ours * commit '3e439db8': DO NOT MERGE ANYWHERE: Don't change screen on time on time changes