Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev