Merge "Fix NPE: hasFullScreenIntent" into main