Merge "Fix a bug in Activity Up navigation dispatching" into jb-dev