Merge "Combine InCallUI & Dialer (part 4)" into klp-dev