Merge "Improve container capability bounding in containers"