Merge "Show settings suggestion" into pi-dev
am: 1b69d7b406

Change-Id: I844f26a32f1c72ed605946d690154fa1f3141a0a