Merge "Restore app pinning."