Merge "Add trackingBug number for UnsupportedAppUsage of mMarquee"