Merge "Change client binding behavior to account for user unlock state." into qt-dev