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

Change-Id: I009a2598fa8620fc07348a70c44db88d43cbd613