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 am: a4c5bfa1 am: dff5c8ae
Change-Id: I9c64b2ce3728ca187f5cc5eb1f4c3c0238f4a789