Merge "Skip indexing content while user is locked." into nyc-dev