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

Change-Id: I361bb68e513c3bdb57f8403967ff5a10314ecf32