Merge "Remove wallpaper activity when moving to fullscreen/splitscreen" into main