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

Change-Id: I8e9b8d8283c2f2b8dd75549d9370af89bfec0763