Merge "Prevent NPE in QuickQSPanel"