Merge "Unrestrict app if it been set as device admin app" into pi-dev