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: 95302fd9 am: 521f6461
Change-Id: If3b3fe71c50b7224c3ad44b968219fbc970d8322