Merge "Don't take invisible screenshots" into oc-mr1-dev
am: 6d9d42f6aa

Change-Id: I983bb9c73c4cdb43aa0c6ef33748da2a68db0d28