Merge "Handle condition changes when metric is not active." into qt-dev
am: d0ffaeb4b5

Change-Id: Iea027c44bbe8b56bd14873edcf6b4f08b0181a29