Merge "add unit tests for screen-on blocker when change screen state" into main