Merge "Fix the framestats test to use its own activity" into mnc-dev