Merge "Change encryption preference's summary accordingly" into pi-dev