Merge "Close account settings if there's no account to show" into lmp-mr1-dev