Merge "Specify up navigation behavior"