Merge "Fix for call timer resetting when starting IMS conference call. 4/4" into lmp-mr1-dev