Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev