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