Merge "AM: Fix invalid hot launch app metrics seen with quickstep"