Merge "Correct value of supported keepalive count for cellular" into qt-dev