Merge "DO NOT MERGE Reflect the selection state that reflects the current task stack upon restarting the Navigation Bar." into qt-qpr1-dev am: 33c8124f04

Change-Id: I14b478278008b45ae94bcf29e48102f399ce4f37