Merge "Move permission backup into permission controller"