Merge "Cleanup AcitivityManagerConstants and AppSearch" into sc-dev