Merge "Update mFirstVisibleIconState correctly" into pi-dev