Merge pull request #9806 from leob2g/Bug_872844_Clearing_input_fields_error

Bug 872844 - [Settings] Clearing input fields when enter wrong PIN code, r=kaze(cherry picked from commit e99e62ce2586c98ae491cccc9fe772f8cddf423b)