Merge "Cancel fullscreen countdown timer on interaction." into oc-mr1-dev
am: 12c586c5be

Change-Id: I4edaadb77d9ea9e263894a710319a64bacffd8ef