Merge "DO NOT MERGE Prevent back navigation not working after activity re-created" into tm-qpr-dev