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

Change-Id: I361d29c828f92ee7defe19d771d03e042216fa98