Merge "Skip screenshots when user storage is locked." into nyc-mr1-dev