Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev