Merge "Allow restoring of apps that rotated key"