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