Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev