Merge "Always save message permission choice"