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