Merge "Display home activity behind pinned activity that should return home" into nyc-dev