Merge "Fix NPE in findFrameMetricsObserver" into qt-dev
am: 1d40ffcabf

Change-Id: Ia13a64a01faa9ab1cc5d7fa914ef306db159a146