Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev