Merge "Update mFirstVisibleIconState correctly" into pi-dev am: ec3f8260de
am: 25c8585b6c

Change-Id: I6c136aaa1f682420be6490e9fe374033180dbe57