Merge "Fix action container visibility" into nyc-dev