Merge "Plumming of perm restore via permission controller"