Merge "Add lock icon to bouncer when scrimmed"