Merge "Add null check to confirm there is a quick settings panel" into pi-dev