Avoid warning when checking whether we are in the usercorner
Merge branch 'jag/avoid-check-usercorner-warn'