Fix for pincode related bug and oauth screen display type.