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

Change-Id: I09a30f210a7ddd2a602d600e7b91c58a26592039