Merge "Fix usage of WindowManager in c.a.coretests.apps.bstatstestapp.TestService." into rvc-dev