[FIX] RT-2105 Password Required flow change

-And some additional UI changes to the security settings page
[FIX] Resolve merge conflict

-Fix flow in password required flow
-Other UI changes on the security settings page
Merge pull request #1424 from mrajvanshy/pwRequiredFlow

[FIX] Password required flow changes