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