[automerger skipped] DO NOT MERGE Reflect the selection state that reflects...

[automerger skipped] DO NOT MERGE Reflect the selection state that reflects the current task stack upon restarting the Navigation Bar. am: 3cc97583 am: 7d6be5e6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia525dcdb9c3ddfa35a51b739b373da6cc43283b5