Merge "Allow more flexibility for icon selection" into pi-dev am: 2e79c79ecd
am: 983738a2dd

Change-Id: Iaf083e0a16ad28bdbe5834b5b5dd143544cf93db