Merge "Allow restoring of apps that rotated key" into pi-dev