Merge "Remove unnecessary WTFs from password state check" into pi-dev