Merge "Update password landscape layout" into rvc-dev