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

Change-Id: I75229cf1b8aafc7c8a933a9d2c7c6d4ac19e68d4