Merge "Keep InCallUI in memory (1/3)" into cm-11.0