Merge "Not reseting the last fullscreenintent time when reinflating" into oc-mr1-dev