Merge "Fix fullscreen intent notifs"