Merge "Rename checkSystemBarServicePermission" into main