Merge "Stop creating extra apk session during pre-reboot verification"