Merge "Add content description to zenmode" into pi-dev