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 am: 2632da80
Change-Id: Ie586718deb92a55c314ca262426861be8336cf03