Merge "Convert encryption status to preference controller"