Merge pull request #1670 from vhpoet/release

[TASK] USD Fund: Don't show the widget on password popup cancel
[TASK] USD Fund: Locked account message change