Merge "App ops: cleanup, handle root and shell, perms."