Merge branch 'fix/2189-unpin-activity' into 'develop'