Merge "Adding tracing for mismatch between current and stable states" into ub-launcher3-qt-qpr1-dev
am: 78ebf57e9f

Change-Id: Ifac50ddd7ad0a689722e4911a735cf2d503d177a