Merge "Add logging to help debug invalid icon state and UI." into sc-v2-dev