Merge "Fix untrusted activity not shown when pinned" into main