Merge "Dejank QS edit screen." into pi-dev
am: 61b93505ba

Change-Id: Idd9b8e95f38f9e92211b2e8796add48d3383e4b5