Merge "Dialer: InCallUI display as black after exit split screen"