MOB-510: Fixes for disabling switch while loading