Merge "Dejank QS edit screen." into pi-dev