Controls UI - Use custom icon for favoriting

Apply custom icons, if any, during add controls. Edit controls the
issue still exists but will handle separately.

Fixes: 159562131
Test: manual, mock app use TYPE_FAN
Change-Id: Ib75756a8b6fa6e78a678fc8d6ceb3e4cdaafc142