Merge changes I40041727,I18121754

* changes:
  Update the change status text correctly
  Do not show label status when revision is not current