Merge "Fix MediaStubActivity Layout"