Merge "Make FullscreenTaskListener overridable"