Merge "3322879 Device soft reboots on enabling and disabling accessibility settings (caused due to my incorrect fix of 3304011 in change If99ef28c)"