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

[automerger skipped] Merge "DO NOT MERGE Reflect the selection state that reflects the current task stack upon restarting the Navigation Bar." into qt-qpr1-dev am: 33c8124f am: 02c9c4b9 -s ours
am skip reason: subject contains skip directive

Change-Id: I6c0269cad248c3a03dd0e7627baa710d454b553d