Merge "libgui: Add frame number and clean up BQ dump"