Merge "Not reseting the last fullscreenintent time when reinflating" into oc-mr1-dev am: fa7d4f4c7b
am: aed8ed7e8b

Change-Id: I39f6c1ce7f404d7bcfac9b786eb02ee83b02a55f