Merge "MediaActivityTest: Do not fail in main thread for locked device" into rvc-dev