Merge "Add new layout for session based media players"