Merge "Don't update cached ApplicationInfo with old information"