Merge "Block touches from passing through activities"