Merge "Cancel fullscreen countdown timer on interaction." into oc-mr1-dev