Merge "Make TestCallActivity Theme.NoDisplay" into mnc-dev