Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev