Merge "Updated layout for more compact player" into sc-dev