US11533473B2 - Method and Apparatus for Further Improved Context Design for Prediction Mode and Coded Block Flag (CBF)