Merge "Screenshots broken for activities with dialog themes" into pi-dev