Merge "Do not take screenshots when launching activities..." into klp-dev