Merge "Do not make ActivityContainer available to apps."