Merge "Have some shell start activity commands go thorugh AMS instead of ATMS (28/n)"