Merge "Don't send pause again when coming back from full screen"