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