Whether China has Xi Jinping or not, it will tighten up control over Hong Kong at some stage. The promise of 50 years of no change in Hong Kong always implied that, by 2047, the Chinese government expects Hong Kong to be another Chinese city.
The extension of the arrangement for the 50 years was never really on the agenda, but we are talking about 22 and 23 years into the 50-year period. There is, therefore, no need for Hong Kong to have reached the point that it has reached now. That is the result of Xi Jinping's change in his approach, but even without Xi Jinping, at some stage we will get to where we are now.