Merge "hikey/hikey960: Set verifiedbootstate property" into main