Icloud photo library stuck uploading

My iphone has been stuck uploading photos to the icloud photo library. Same issue as many complained in beta icloud photo library though it is out of beta now. Turning off/on and uploading from scratch helps but then it stucks anyway.

iPhone 6, iOS 8.3