Merge "Tweaks to Activity up navigation"