Don't let locked views be added to collections

Bug 1323163. This patch still allows locked views to be *removed*
from collections. Whether that should be banned as well is a separate
question.

Change-Id: I54ffa3fecdeeb7ef9d4d8c382750659d59d2722e
Merge "Don't let locked views be added to collections"