Merge "Handle Activity Resume to Stop case for AppUsage logging" into rvc-qpr-dev