Merge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-dev