Merge "Add dialog for summary tip" into pi-dev