Merge "Added logging for setting mMotionAborted in NPVC" into tm-qpr-dev