Merge "Change system alert window setting proto comments"