Merge "Unhide social stream permissions." into ics-mr1