Minor layout changes to activity_setpassword. No changes to
activity_test_lock.