Merge "Small changes to ImsTestApp when testing ImsService changes"