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
Change-Id: Ifb9e21df4f6ed4d52a7d68d382a1391dc1270c95