Merge "Apply the selection state that reflects the current task stack upon...
Merge "Apply the selection state that reflects the current task stack upon restarting the Navigation Bar." into rvc-dev am: 97f4e229 am: bb57e005
Change-Id: Idd98e79e0101ed22d745db749e7882085d86f467