Merge "Show settings suggestion" into pi-dev