* commit '28de8edb7d72f938f47d7fdd8ce058c5c8933b8e': Do not make ActivityContainer available to apps. DO NOT MERGE