Merge "Always show back button when screen pinning, for prototype"