Merge "Clear pending activity launches when force stop package"