Merge "BigPictureStyle: set unused big picture extra to null" into main